Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

5.14 compat: explicity assign set_page_dirty #12427

Merged
merged 1 commit into from
Jul 26, 2021
Merged

5.14 compat: explicity assign set_page_dirty #12427

merged 1 commit into from
Jul 26, 2021

Conversation

ckane
Copy link
Contributor

@ckane ckane commented Jul 24, 2021

Motivation and Context

Booting into a ZFS root partition causes systemd-journald, and probably other things, to fail due to set_page_dirty now being a NULL pointer in 5.14 unless this field is set manually.

This problem was encountered in #12409, but is actually unrelated regression introduced in 5.14

Description

Kernel 5.14 introduced a change where set_page_dirty of
struct address_space_operations is no longer implicitly set to
__set_page_dirty_buffers(), which ended up resulting in a NULL
pointer deref in the kernel when it is attempted to be called.
Both of these interfaces have been around for a long time, so
this change tests if the set_page_dirty member can be assigned
to __set_page_dirty_buffers - which means this change forces
this behavior on older kernels than for which the breaking change
was introduced.

How Has This Been Tested?

I am testing on my personal daily-use system. I am able to do all of the things that I was unable to do before.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

@ckane
Copy link
Contributor Author

ckane commented Jul 24, 2021

I have also tested this on 5.13.4 and it is still working fine on the older kernel, and I verified that the struct member assignment is being compiled in there still too

behlendorf
behlendorf reviewed Jul 24, 2021
View reviewed changes
Copy link
Contributor

@behlendorf behlendorf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for running down this mmap(2) kernel change! Just for future reference the upstream commit which introduced this was torvalds/linux@0af5737.

module/os/linux/zfs/zpl_file.c Outdated Show resolved Hide resolved
@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Jul 24, 2021
@behlendorf behlendorf self-assigned this Jul 24, 2021
@ckane ckane force-pushed the add-set_page_dirty branch from db5b023 to f95b56a Compare July 25, 2021 17:08
behlendorf
behlendorf approved these changes Jul 25, 2021
View reviewed changes
Copy link
Contributor

@behlendorf behlendorf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, just two nits for small typo.

config/kernel-vfs-set_page_dirty.m4 Outdated Show resolved Hide resolved
config/kernel-vfs-set_page_dirty.m4 Outdated Show resolved Hide resolved
@ckane
5.14 compat: explicity assign set_page_dirty
09b92be 
Kernel 5.14 introduced a change where set_page_dirty of
struct address_space_operations is no longer implicitly set to
__set_page_dirty_buffers(), which ended up resulting in a NULL
pointer deref in the kernel when it is attempted to be called.
This change sets .set_page_dirty in the structure to
__set_page_dirty_nobuffers(), which was introduced with the
related patch set. The breaking change was introduce in commit
0af573780b0b13fceb7fabd49dc1b073cee9a507 to torvalds/linux.git.

Signed-off-by: Coleman Kane <[email protected]>
@ckane ckane force-pushed the add-set_page_dirty branch from f95b56a to 09b92be Compare July 25, 2021 20:38
@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Jul 26, 2021
@behlendorf behlendorf merged commit 1c24bf9 into openzfs:master Jul 26, 2021
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Aug 23, 2021
@ckane @behlendorf
Linux 5.14 compat: explicity assign set_page_dirty
c98b39a 
Kernel 5.14 introduced a change where set_page_dirty of
struct address_space_operations is no longer implicitly set to
__set_page_dirty_buffers(), which ended up resulting in a NULL
pointer deref in the kernel when it is attempted to be called.
This change sets .set_page_dirty in the structure to
__set_page_dirty_nobuffers(), which was introduced with the
related patch set. The breaking change was introduce in commit
0af573780b0b13fceb7fabd49dc1b073cee9a507 to torvalds/linux.git.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes openzfs#12427
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Aug 24, 2021
@ckane @behlendorf
Linux 5.14 compat: explicity assign set_page_dirty
2f1a593 
Kernel 5.14 introduced a change where set_page_dirty of
struct address_space_operations is no longer implicitly set to
__set_page_dirty_buffers(), which ended up resulting in a NULL
pointer deref in the kernel when it is attempted to be called.
This change sets .set_page_dirty in the structure to
__set_page_dirty_nobuffers(), which was introduced with the
related patch set. The breaking change was introduce in commit
0af573780b0b13fceb7fabd49dc1b073cee9a507 to torvalds/linux.git.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes openzfs#12427
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Aug 24, 2021
@ckane
Linux 5.14 compat: explicity assign set_page_dirty
8e360b0 
Kernel 5.14 introduced a change where set_page_dirty of
struct address_space_operations is no longer implicitly set to
__set_page_dirty_buffers(), which ended up resulting in a NULL
pointer deref in the kernel when it is attempted to be called.
This change sets .set_page_dirty in the structure to
__set_page_dirty_nobuffers(), which was introduced with the
related patch set. The breaking change was introduce in commit
0af573780b0b13fceb7fabd49dc1b073cee9a507 to torvalds/linux.git.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes openzfs#12427
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Aug 24, 2021
@ckane @behlendorf
Linux 5.14 compat: explicity assign set_page_dirty
776fd9b 
Kernel 5.14 introduced a change where set_page_dirty of
struct address_space_operations is no longer implicitly set to
__set_page_dirty_buffers(), which ended up resulting in a NULL
pointer deref in the kernel when it is attempted to be called.
This change sets .set_page_dirty in the structure to
__set_page_dirty_nobuffers(), which was introduced with the
related patch set. The breaking change was introduce in commit
0af573780b0b13fceb7fabd49dc1b073cee9a507 to torvalds/linux.git.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes openzfs#12427
behlendorf pushed a commit that referenced this pull request Aug 31, 2021
@ckane @behlendorf
Linux 5.14 compat: explicity assign set_page_dirty
06b98ba 
Kernel 5.14 introduced a change where set_page_dirty of
struct address_space_operations is no longer implicitly set to
__set_page_dirty_buffers(), which ended up resulting in a NULL
pointer deref in the kernel when it is attempted to be called.
This change sets .set_page_dirty in the structure to
__set_page_dirty_nobuffers(), which was introduced with the
related patch set. The breaking change was introduce in commit
0af573780b0b13fceb7fabd49dc1b073cee9a507 to torvalds/linux.git.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes #12427
veggiemike pushed a commit to veggiemike/zfs that referenced this pull request Sep 6, 2021
@ckane @veggiemike
Linux 5.14 compat: explicity assign set_page_dirty
51b16c4 
Kernel 5.14 introduced a change where set_page_dirty of
struct address_space_operations is no longer implicitly set to
__set_page_dirty_buffers(), which ended up resulting in a NULL
pointer deref in the kernel when it is attempted to be called.
This change sets .set_page_dirty in the structure to
__set_page_dirty_nobuffers(), which was introduced with the
related patch set. The breaking change was introduce in commit
0af573780b0b13fceb7fabd49dc1b073cee9a507 to torvalds/linux.git.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes openzfs#12427
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 7, 2021
@ckane @tonyhutter
Linux 5.14 compat: explicity assign set_page_dirty
9cac0b5 
Kernel 5.14 introduced a change where set_page_dirty of
struct address_space_operations is no longer implicitly set to
__set_page_dirty_buffers(), which ended up resulting in a NULL
pointer deref in the kernel when it is attempted to be called.
This change sets .set_page_dirty in the structure to
__set_page_dirty_nobuffers(), which was introduced with the
related patch set. The breaking change was introduce in commit
0af573780b0b13fceb7fabd49dc1b073cee9a507 to torvalds/linux.git.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes openzfs#12427
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 15, 2021
@ckane @tonyhutter
Linux 5.14 compat: explicity assign set_page_dirty
4434baa 
Kernel 5.14 introduced a change where set_page_dirty of
struct address_space_operations is no longer implicitly set to
__set_page_dirty_buffers(), which ended up resulting in a NULL
pointer deref in the kernel when it is attempted to be called.
This change sets .set_page_dirty in the structure to
__set_page_dirty_nobuffers(), which was introduced with the
related patch set. The breaking change was introduce in commit
0af573780b0b13fceb7fabd49dc1b073cee9a507 to torvalds/linux.git.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes openzfs#12427
tonyhutter pushed a commit that referenced this pull request Sep 21, 2021
@ckane @tonyhutter
Linux 5.14 compat: explicity assign set_page_dirty
d171604 
Kernel 5.14 introduced a change where set_page_dirty of
struct address_space_operations is no longer implicitly set to
__set_page_dirty_buffers(), which ended up resulting in a NULL
pointer deref in the kernel when it is attempted to be called.
This change sets .set_page_dirty in the structure to
__set_page_dirty_nobuffers(), which was introduced with the
related patch set. The breaking change was introduce in commit
0af573780b0b13fceb7fabd49dc1b073cee9a507 to torvalds/linux.git.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes #12427
tonyhutter pushed a commit that referenced this pull request Sep 22, 2021
@ckane @tonyhutter
Linux 5.14 compat: explicity assign set_page_dirty
6b9d0ed 
Kernel 5.14 introduced a change where set_page_dirty of
struct address_space_operations is no longer implicitly set to
__set_page_dirty_buffers(), which ended up resulting in a NULL
pointer deref in the kernel when it is attempted to be called.
This change sets .set_page_dirty in the structure to
__set_page_dirty_nobuffers(), which was introduced with the
related patch set. The breaking change was introduce in commit
0af573780b0b13fceb7fabd49dc1b073cee9a507 to torvalds/linux.git.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes #12427
ghost pushed a commit to truenas/zfs that referenced this pull request Oct 7, 2021
@ckane
Linux 5.14 compat: explicity assign set_page_dirty
2ba19c8 
Kernel 5.14 introduced a change where set_page_dirty of
struct address_space_operations is no longer implicitly set to
__set_page_dirty_buffers(), which ended up resulting in a NULL
pointer deref in the kernel when it is attempted to be called.
This change sets .set_page_dirty in the structure to
__set_page_dirty_nobuffers(), which was introduced with the
related patch set. The breaking change was introduce in commit
0af573780b0b13fceb7fabd49dc1b073cee9a507 to torvalds/linux.git.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes openzfs#12427
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@behlendorf behlendorf behlendorf approved these changes

Assignees

@behlendorf behlendorf

Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ckane @behlendorf